backport: Merge bitcoin/bitcoin#23050 #6221
Draft
+2
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vijaydasmp
force-pushed
the
bp23_89
branch
2 times, most recently
from
9f2112f
to
397c0da
Compare
vijaydasmp
changed the title
vijaydasmp
force-pushed
the
bp23_89
branch
3 times, most recently
from
91b9bd8
to
e4f4403
Compare
vijaydasmp
changed the title
|
This pull request has conflicts, please rebase. |
vijaydasmp
force-pushed
the
bp23_89
branch
2 times, most recently
from
b05f47d
to
6e2c9e7
Compare
|
This pull request has conflicts, please rebase. |
vijaydasmp
changed the title
vijaydasmp
changed the title
|
This pull request has conflicts, please rebase. |
vijaydasmp
changed the title
|
This pull request has conflicts, please rebase. |
…ce-versa c17f554 Fix BlockAssembler::AddToBlock, CTxMemPool::PrioritiseTransaction logging (Jon Atack) Pull request description: This is a tale of two fees, er, fee rates... indeed, one is misdescribed as a fee, and the other is incorrectly called a fee rate. From this review discussion: bitcoin#22689 (comment) (thanks to John Newbery). ACKs for top commit: laanwj: Code review ACK c17f554 Tree-SHA512: 3d9df3209a72562c5f9bbf815923d5b089d04491b8d19caa2c04158c501b47ef01e47f1c32d89adcbaf3c6357329507f65b4bb2963214c3451bbfa61ac812530
vijaydasmp
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
btc backports